From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
Date: Fri, 17 Mar 2017 08:42:32 +0000 (+0800)
Subject: libxl/libxl_qmp.c: Update COLO query replication status API
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~2462
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=7c2c1763aa6b63699dbb0c877f8b11aaa679cf3a;p=xen.git

libxl/libxl_qmp.c: Update COLO query replication status API

The QEMU community has asked us to change QMP command
xen-get-replication-error to query-xen-replication-status. Modify Xen
side to use the new name.

Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
---

diff --git a/tools/libxl/libxl_colo_restore.c b/tools/libxl/libxl_colo_restore.c
index 7178ae9b84..0c535bd95d 100644
--- a/tools/libxl/libxl_colo_restore.c
+++ b/tools/libxl/libxl_colo_restore.c
@@ -986,7 +986,7 @@ static void colo_suspend_vm_done(libxl__egc *egc,
 
     crcs->status = LIBXL_COLO_SUSPENDED;
 
-    if (libxl__qmp_get_replication_error(gc, crs->domid)) {
+    if (libxl__qmp_query_xen_replication_status(gc, crs->domid)) {
         LOGD(ERROR, crs->domid, "replication error occurs when secondary vm is running");
         goto out;
     }
diff --git a/tools/libxl/libxl_colo_save.c b/tools/libxl/libxl_colo_save.c
index eabc04c88b..f687d5af38 100644
--- a/tools/libxl/libxl_colo_save.c
+++ b/tools/libxl/libxl_colo_save.c
@@ -345,7 +345,8 @@ static void colo_read_svm_suspended_done(libxl__egc *egc,
         goto out;
     }
 
-    if (!css->paused && libxl__qmp_get_replication_error(gc, dss->domid)) {
+    if (!css->paused &&
+        libxl__qmp_query_xen_replication_status(gc, dss->domid)) {
         LOGD(ERROR, dss->domid,
              "replication error occurs when primary vm is running");
         goto out;
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index 9fc05e7093..25cb08ac2d 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -1829,7 +1829,7 @@ _hidden int libxl__qmp_nbd_server_add(libxl__gc *gc, int domid,
 _hidden int libxl__qmp_start_replication(libxl__gc *gc, int domid,
                                          bool primary);
 /* Get replication error that occurs when the vm is running */
-_hidden int libxl__qmp_get_replication_error(libxl__gc *gc, int domid);
+_hidden int libxl__qmp_query_xen_replication_status(libxl__gc *gc, int domid);
 /* Do checkpoint */
 _hidden int libxl__qmp_colo_do_checkpoint(libxl__gc *gc, int domid);
 /* Stop replication */
diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c
index eef772220f..eab993aca9 100644
--- a/tools/libxl/libxl_qmp.c
+++ b/tools/libxl/libxl_qmp.c
@@ -1079,9 +1079,9 @@ int libxl__qmp_start_replication(libxl__gc *gc, int domid, bool primary)
     return qmp_run_command(gc, domid, "xen-set-replication", args, NULL, NULL);
 }
 
-int libxl__qmp_get_replication_error(libxl__gc *gc, int domid)
+int libxl__qmp_query_xen_replication_status(libxl__gc *gc, int domid)
 {
-    return qmp_run_command(gc, domid, "xen-get-replication-error", NULL,
+    return qmp_run_command(gc, domid, "query-xen-replication-status", NULL,
                            NULL, NULL);
 }